Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 11 Apr 2010 10:53:01 +0000 (10:53 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 11 Apr 2010 10:53:01 +0000 (10:53 +0000)

Trivial merge